<?
global $db;
$params = inc_incfile("wiki/global.php",$params);

skin_param("title","Conflict");

echo "<p>Please note, someone updated this item while you were editing.  Your changes may have overwritten their changes.</p>";

echo "<h2>Original Item</h2>";
$e = $db->query1("select * from wiki where id = ".$db->sqlint($_REQUEST["oldid"]));
echo "<form><textarea cols=80 rows=10>".htmlentities($e["content"])."</textarea></form>";

echo "<h2>Their Update</h2>";
$e = $db->query1("select * from wiki where id = ".$db->sqlint($_REQUEST["midid"]));
echo "<form><textarea cols=80 rows=10>".htmlentities($e["content"])."</textarea></form>";

echo "<h2>Your Update</h2>";
echo "<p>Please edit Your Update to include the changes in Thier Update.</p>";
$e=$params; #HACK: might in some odd case, newid!=this..tough luck
inc_incfile("wiki/{$e["type"]}_edit.php",$params);






